From 590d952d4b75850e96f59a125c949407c79a0d7d Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Wed, 3 Feb 2021 23:44:08 +0100 Subject: [PATCH] [PATCH 04/10] rename fill_dev_*_t to pocl_fill_dev_*_t Gbp-Pq: Name 0004-rename-fill_dev_-_t-to-pocl_fill_dev_-_t.patch --- lib/CL/devices/basic/basic.c | 4 ++-- lib/CL/devices/common.c | 6 +++--- lib/CL/devices/common.h | 6 +++--- lib/CL/devices/pthread/pthread_utils.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/CL/devices/basic/basic.c b/lib/CL/devices/basic/basic.c index 99f8572..47b831f 100644 --- a/lib/CL/devices/basic/basic.c +++ b/lib/CL/devices/basic/basic.c @@ -375,7 +375,7 @@ pocl_basic_run (void *data, _cl_command_node *cmd) else if (meta->arg_info[i].type == POCL_ARG_TYPE_IMAGE) { dev_image_t di; - fill_dev_image_t (&di, al, cmd->device); + pocl_fill_dev_image_t (&di, al, cmd->device); void *devptr = pocl_aligned_malloc (MAX_EXTENDED_ALIGNMENT, sizeof (dev_image_t)); @@ -386,7 +386,7 @@ pocl_basic_run (void *data, _cl_command_node *cmd) else if (meta->arg_info[i].type == POCL_ARG_TYPE_SAMPLER) { dev_sampler_t ds; - fill_dev_sampler_t(&ds, al); + pocl_fill_dev_sampler_t (&ds, al); arguments[i] = malloc (sizeof (void *)); *(void **)(arguments[i]) = (void *)ds; } diff --git a/lib/CL/devices/common.c b/lib/CL/devices/common.c index 274cacb..a62eca6 100644 --- a/lib/CL/devices/common.c +++ b/lib/CL/devices/common.c @@ -261,8 +261,8 @@ FINISH: * from given kernel image argument */ void -fill_dev_image_t (dev_image_t* di, struct pocl_argument* parg, - cl_device_id device) +pocl_fill_dev_image_t (dev_image_t *di, struct pocl_argument *parg, + cl_device_id device) { cl_mem mem = *(cl_mem *)parg->value; di->_width = mem->image_width; @@ -791,7 +791,7 @@ pocl_broadcast (cl_event brc_event) * from given kernel sampler argument */ void -fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg) +pocl_fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg) { cl_sampler sampler = *(cl_sampler *)parg->value; diff --git a/lib/CL/devices/common.h b/lib/CL/devices/common.h index e9a6bca..239e69c 100644 --- a/lib/CL/devices/common.h +++ b/lib/CL/devices/common.h @@ -64,10 +64,10 @@ int llvm_codegen (char *output, unsigned device_i, cl_kernel kernel, cl_device_id device, _cl_command_node *command, int specialize); -void fill_dev_image_t (dev_image_t *di, struct pocl_argument *parg, - cl_device_id device); +void pocl_fill_dev_image_t (dev_image_t *di, struct pocl_argument *parg, + cl_device_id device); -void fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg); +void pocl_fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg); void pocl_copy_mem_object (cl_device_id dest_dev, cl_mem dest, size_t dest_offset, diff --git a/lib/CL/devices/pthread/pthread_utils.c b/lib/CL/devices/pthread/pthread_utils.c index 98e0144..2b98274 100644 --- a/lib/CL/devices/pthread/pthread_utils.c +++ b/lib/CL/devices/pthread/pthread_utils.c @@ -146,7 +146,7 @@ setup_kernel_arg_array (kernel_run_command *k) else if (meta->arg_info[i].type == POCL_ARG_TYPE_IMAGE) { dev_image_t di; - fill_dev_image_t(&di, al, k->device); + pocl_fill_dev_image_t (&di, al, k->device); void *devptr = pocl_aligned_malloc (MAX_EXTENDED_ALIGNMENT, sizeof (dev_image_t)); arguments[i] = &arguments2[i]; @@ -156,7 +156,7 @@ setup_kernel_arg_array (kernel_run_command *k) else if (meta->arg_info[i].type == POCL_ARG_TYPE_SAMPLER) { dev_sampler_t ds; - fill_dev_sampler_t(&ds, al); + pocl_fill_dev_sampler_t (&ds, al); arguments[i] = &arguments2[i]; arguments2[i] = (void *)ds; -- 2.30.2